change to use gtk_tree_view_real_expand_row() instead of doing this by

Mon Apr  4 19:13:23 2005  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtktreeview.c (gtk_tree_view_expand_all): change to use
        gtk_tree_view_real_expand_row() instead of doing this by hand.

diff --git a/ChangeLog b/ChangeLog
index 4ed9b5c14805e3b5c5fd0b3b24adcbe6a0a35585..6509a3e2d6f2334cbb012a6fa92adb3abfe955d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr  4 19:13:23 2005  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_expand_all): change to use
+       gtk_tree_view_real_expand_row() instead of doing this by hand.
+
 2005-04-04  Johan Dahlin  <johan@gnome.org>
 
        * gtk/gtktextbuffer.c: (gtk_text_buffer_class_init),

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4ed9b5c14805e3b5c5fd0b3b24adcbe6a0a35585..6509a3e2d6f2334cbb012a6fa92adb3abfe955d5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Apr  4 19:13:23 2005  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_expand_all): change to use
+       gtk_tree_view_real_expand_row() instead of doing this by hand.
+
 2005-04-04  Johan Dahlin  <johan@gnome.org>
 
        * gtk/gtktextbuffer.c: (gtk_text_buffer_class_init),

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4ed9b5c14805e3b5c5fd0b3b24adcbe6a0a35585..6509a3e2d6f2334cbb012a6fa92adb3abfe955d5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Apr  4 19:13:23 2005  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_expand_all): change to use
+       gtk_tree_view_real_expand_row() instead of doing this by hand.
+
 2005-04-04  Johan Dahlin  <johan@gnome.org>
 
        * gtk/gtktextbuffer.c: (gtk_text_buffer_class_init),

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 308607377819826ce0de9b9ab2b0dfa677cf6c07..84c5f7a94687098c51ca4c38100a9445ab8ecf75 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10342,48 +10342,6 @@ gtk_tree_view_expand_all_emission_helper (GtkRBTree *tree,
                           gtk_tree_view_expand_all_emission_helper,
                           tree_view);
 }
-
-static void
-gtk_tree_view_expand_all_helper (GtkRBTree  *tree,
-                                GtkRBNode  *node,
-                                gpointer  data)
-{
-  GtkTreeView *tree_view = data;
-
-  if (node->children)
-    _gtk_rbtree_traverse (node->children,
-                         node->children->root,
-                         G_PRE_ORDER,
-                         gtk_tree_view_expand_all_helper,
-                         data);
-  else if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT && node->children == NULL)
-    {
-      GtkTreePath *path;
-      GtkTreeIter iter;
-      GtkTreeIter child;
-
-      node->children = _gtk_rbtree_new ();
-      node->children->parent_tree = tree;
-      node->children->parent_node = node;
-      path = _gtk_tree_view_find_path (tree_view, tree, node);
-      gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-      gtk_tree_model_iter_children (tree_view->priv->model, &child, &iter);
-      gtk_tree_view_build_tree (tree_view,
-                               node->children,
-                               &child,
-                               gtk_tree_path_get_depth (path) + 1,
-                               TRUE);
-
-      g_signal_emit (tree_view, tree_view_signals[ROW_EXPANDED], 0, &iter, path);
-      _gtk_rbtree_traverse (node->children,
-                            node->children->root,
-                            G_PRE_ORDER,
-                            gtk_tree_view_expand_all_emission_helper,
-                            tree_view);
-      gtk_tree_path_free (path);
-    }
-}
-
 /**
  * gtk_tree_view_expand_all:
  * @tree_view: A #GtkTreeView.
@@ -10393,16 +10351,26 @@ gtk_tree_view_expand_all_helper (GtkRBTree  *tree,
 void
 gtk_tree_view_expand_all (GtkTreeView *tree_view)
 {
+  GtkTreePath *path;
+  GtkRBTree *tree;
+  GtkRBNode *node;
+
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   if (tree_view->priv->tree == NULL)
     return;
 
-  _gtk_rbtree_traverse (tree_view->priv->tree,
-                       tree_view->priv->tree->root,
-                       G_PRE_ORDER,
-                       gtk_tree_view_expand_all_helper,
-                       tree_view);
+  path = gtk_tree_path_new_first ();
+  _gtk_tree_view_find_node (tree_view, path, &tree, &node);
+
+  while (node)
+    {
+      gtk_tree_view_real_expand_row (tree_view, path, tree, node, TRUE, FALSE);
+      node = _gtk_rbtree_next (tree, node);
+      gtk_tree_path_next (path);
+  }
+
+  gtk_tree_path_free (path);
 }
 
 /* Timeout to animate the expander during expands and collapses */